Merge from trunk
authorJason Rumney <jasonr@gnu.org>
Thu, 7 Jan 2010 13:53:57 +0000 (21:53 +0800)
committerJason Rumney <jasonr@gnu.org>
Thu, 7 Jan 2010 13:53:57 +0000 (21:53 +0800)

Trivial merge